Commit d1404656 authored by wjf's avatar wjf

1

parents d5821064 60b59494
...@@ -3,9 +3,14 @@ ...@@ -3,9 +3,14 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment=""> <list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.getTaskList.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/babycare.getTaskList.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.gameOver.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/babycare.gameOver.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/common/G_EVENT.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/G_EVENT.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$/src/panels/TaskPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/TaskPanel.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resource/StartPanelPrize/prize.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/SuccessPanel/道具.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TaoBaoNet.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/TaoBaoNet.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.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" />
...@@ -111,7 +116,7 @@ ...@@ -111,7 +116,7 @@
<workItem from="1594777357248" duration="24313000" /> <workItem from="1594777357248" duration="24313000" />
<workItem from="1594864188027" duration="20343000" /> <workItem from="1594864188027" duration="20343000" />
<workItem from="1594950738970" duration="22032000" /> <workItem from="1594950738970" duration="22032000" />
<workItem from="1595209499266" duration="7026000" /> <workItem from="1595209499266" duration="18405000" />
</task> </task>
<task id="LOCAL-00001" summary="111"> <task id="LOCAL-00001" summary="111">
<created>1594122339119</created> <created>1594122339119</created>
...@@ -274,7 +279,14 @@ ...@@ -274,7 +279,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1595215296744</updated> <updated>1595215296744</updated>
</task> </task>
<option name="localTasksCounter" value="24" /> <task id="LOCAL-00024" summary="Success Panel Effect!">
<created>1595216703734</created>
<option name="number" value="00024" />
<option name="presentableId" value="LOCAL-00024" />
<option name="project" value="LOCAL" />
<updated>1595216703734</updated>
</task>
<option name="localTasksCounter" value="25" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -288,10 +300,10 @@ ...@@ -288,10 +300,10 @@
<option name="LAST_COMMIT_MESSAGE" value="Success Panel Effect!" /> <option name="LAST_COMMIT_MESSAGE" value="Success Panel Effect!" />
</component> </component>
<component name="WindowStateProjectService"> <component name="WindowStateProjectService">
<state x="440" y="273" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1594106579644"> <state x="440" y="273" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1595229546530">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="440" y="273" key="#com.intellij.execution.impl.EditConfigurationsDialog/31.23.1889.1177@31.23.1889.1177" timestamp="1594106579644" /> <state x="440" y="273" key="#com.intellij.execution.impl.EditConfigurationsDialog/31.23.1889.1177@31.23.1889.1177" timestamp="1595229546530" />
<state x="188" y="314" key="#dev" timestamp="1594691316512"> <state x="188" y="314" key="#dev" timestamp="1594691316512">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
...@@ -300,30 +312,30 @@ ...@@ -300,30 +312,30 @@
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="251" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/31.23.1889.1177@31.23.1889.1177" timestamp="1594113080922" /> <state x="251" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/31.23.1889.1177@31.23.1889.1177" timestamp="1594113080922" />
<state x="754" y="183" key="CommitChangelistDialog2" timestamp="1595215296546"> <state x="754" y="183" key="CommitChangelistDialog2" timestamp="1595216703539">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="754" y="183" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595215296546" /> <state x="754" y="183" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595216703539" />
<state width="871" height="321" key="GridCell.Tab.0.bottom" timestamp="1595215073648"> <state width="874" height="321" key="GridCell.Tab.0.bottom" timestamp="1595229554319">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="882" height="321" key="GridCell.Tab.0.bottom/31.23.1649.1027@31.23.1649.1027" timestamp="1594827479519" /> <state width="882" height="321" key="GridCell.Tab.0.bottom/31.23.1649.1027@31.23.1649.1027" timestamp="1594827479519" />
<state width="871" height="321" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1595215073648" /> <state width="874" height="321" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1595229554319" />
<state width="871" height="321" key="GridCell.Tab.0.center" timestamp="1595215073646"> <state width="874" height="321" key="GridCell.Tab.0.center" timestamp="1595229554318">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="882" height="321" key="GridCell.Tab.0.center/31.23.1649.1027@31.23.1649.1027" timestamp="1594827479518" /> <state width="882" height="321" key="GridCell.Tab.0.center/31.23.1649.1027@31.23.1649.1027" timestamp="1594827479518" />
<state width="871" height="321" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1595215073646" /> <state width="874" height="321" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1595229554318" />
<state width="871" height="321" key="GridCell.Tab.0.left" timestamp="1595215073646"> <state width="874" height="321" key="GridCell.Tab.0.left" timestamp="1595229554316">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="882" height="321" key="GridCell.Tab.0.left/31.23.1649.1027@31.23.1649.1027" timestamp="1594827479517" /> <state width="882" height="321" key="GridCell.Tab.0.left/31.23.1649.1027@31.23.1649.1027" timestamp="1594827479517" />
<state width="871" height="321" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1595215073646" /> <state width="874" height="321" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1595229554316" />
<state width="871" height="321" key="GridCell.Tab.0.right" timestamp="1595215073647"> <state width="874" height="321" key="GridCell.Tab.0.right" timestamp="1595229554318">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="882" height="321" key="GridCell.Tab.0.right/31.23.1649.1027@31.23.1649.1027" timestamp="1594827479518" /> <state width="882" height="321" key="GridCell.Tab.0.right/31.23.1649.1027@31.23.1649.1027" timestamp="1594827479518" />
<state width="871" height="321" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1595215073647" /> <state width="874" height="321" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1595229554318" />
<state x="82" y="353" key="IDE.errors.dialog" timestamp="1594777965326"> <state x="82" y="353" key="IDE.errors.dialog" timestamp="1594777965326">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
...@@ -336,22 +348,22 @@ ...@@ -336,22 +348,22 @@
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="300" y="248" key="SettingsEditor/31.23.1889.1177@31.23.1889.1177" timestamp="1594798992724" /> <state x="300" y="248" key="SettingsEditor/31.23.1889.1177@31.23.1889.1177" timestamp="1594798992724" />
<state x="92" y="351" key="Vcs.Push.Dialog.v2" timestamp="1595215298063"> <state x="92" y="351" key="Vcs.Push.Dialog.v2" timestamp="1595216704830">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1595215298063" /> <state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1595216704830" />
<state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594705166397"> <state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594705166397">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/31.23.1889.1177@31.23.1889.1177" timestamp="1594705166397" /> <state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/31.23.1889.1177@31.23.1889.1177" timestamp="1594705166397" />
<state x="280" y="23" width="879" height="1158" key="dock-window-1" timestamp="1594969442619"> <state x="280" y="23" width="879" height="1158" key="dock-window-1" timestamp="1595227066273">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="280" y="23" width="879" height="1158" key="dock-window-1/31.23.1889.1177@31.23.1889.1177" timestamp="1594969442619" /> <state x="280" y="23" width="879" height="1158" key="dock-window-1/31.23.1889.1177@31.23.1889.1177" timestamp="1595227066273" />
<state x="907" y="23" width="879" height="1158" key="dock-window-2" timestamp="1594285002126"> <state x="907" y="23" width="879" height="1158" key="dock-window-2" timestamp="1595227066273">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="907" y="23" width="879" height="1158" key="dock-window-2/31.23.1889.1177@31.23.1889.1177" timestamp="1594285002126" /> <state x="907" y="23" width="879" height="1158" key="dock-window-2/31.23.1889.1177@31.23.1889.1177" timestamp="1595227066273" />
<state x="805" y="23" width="879" height="1158" key="dock-window-3" timestamp="1594604843980"> <state x="805" y="23" width="879" height="1158" key="dock-window-3" timestamp="1594604843980">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
...@@ -364,9 +376,9 @@ ...@@ -364,9 +376,9 @@
<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="1594712635697" /> <state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1594712635697" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup" timestamp="1595215066572"> <state x="640" y="288" width="670" height="676" key="search.everywhere.popup" timestamp="1595231652652">
<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="1595215066572" /> <state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595231652652" />
</component> </component>
</project> </project>
\ No newline at end of file
...@@ -2,9 +2,13 @@ ...@@ -2,9 +2,13 @@
"code": "000000", "code": "000000",
"data": { "data": {
"currentLevel": 11, "currentLevel": 11,
"prize": {},
"isPrizeLevel": false, "isPrizeLevel": false,
"tool": {} "tool": {
"type": "HAMMERS"
},
"prize": {
"image": "https://img.alicdn.com/imgextra/i1/2275046294/O1CN01xTeKMI1wMhRux48Y6_!!2275046294-2-miniprogram.png"
}
}, },
"success": true, "success": true,
"message": "成功" "message": "成功"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"message": "OK", "message": "OK",
"data": { "data": {
"power": 0, "power": 0,
"currentLevel": 1, "currentLevel": 120,
"tools": { "tools": {
"STEPS": 1, "STEPS": 1,
"BOOMS": 2, "BOOMS": 2,
......
...@@ -89,11 +89,11 @@ ...@@ -89,11 +89,11 @@
"name": "StartPanel" "name": "StartPanel"
}, },
{ {
"keys": "prize.png,关卡弹窗Bg.png", "keys": "关卡弹窗Bg.png",
"name": "StartPanelPrize" "name": "StartPanelPrize"
}, },
{ {
"keys": "star_dis.png,star_en.png,去抽奖.png,圆角矩形 648.png,道具.png,道具圆圈.png,闯关成功.png,闯关成功Bg.png,闯关成功不满星按钮.png", "keys": "star_dis.png,star_en.png,去抽奖.png,圆角矩形 648.png,道具圆圈.png,闯关成功.png,闯关成功Bg.png,闯关成功不满星按钮.png",
"name": "SuccessPanel" "name": "SuccessPanel"
}, },
{ {
......
...@@ -3713,819 +3713,12 @@ export const ResJson = { ...@@ -3713,819 +3713,12 @@ export const ResJson = {
} }
}, },
{ {
"keys": "carb_arm.png,carb_body.png,carb_hand_l.png,carb_hand_r.png,fox_arm_l.png,fox_body.png,fox_head.png,fox_tail0.png,fox_tail1.png,fox_tail10.png,fox_tail11.png,fox_tail12.png,fox_tail13.png,fox_tail14.png,fox_tail2.png,fox_tail3.png,fox_tail4.png,fox_tail5.png,fox_tail6.png,fox_tail7.png,fox_tail8.png,fox_tail9.png,hommer.png,img_line1.png,img_line2.png,img_line3.png,img_line4.png,img_line5.png,img_owl.png,img_tree.png,lighting_1.png,lighting_2.png,loadingBg.jpg,loadingBg2.png,loadingPro0.png,loadingPro1.png,loadingPro10.png,loadingPro11.png,loadingPro2.png,loadingPro3.png,loadingPro4.png,loadingPro5.png,loadingPro6.png,loadingPro7.png,loadingPro8.png,loadingPro9.png,loadingTitle.png,owl_sleep.png,proDown.png,wheel.png", "keys": "关卡弹窗Bg.png",
"name": "loadingScene", "name": "StartPanelPrize"
"atlas": {
"carb_arm.png": {
"x": 1875,
"y": 350,
"w": 18,
"h": 24,
"ox": 0,
"oy": 0,
"sw": 18,
"sh": 24,
"ro": false
},
"carb_body.png": {
"x": 1904,
"y": 62,
"w": 129,
"h": 101,
"ox": 0,
"oy": 0,
"sw": 129,
"sh": 101,
"ro": false
},
"carb_hand_l.png": {
"x": 1250,
"y": 262,
"w": 43,
"h": 54,
"ox": 0,
"oy": 0,
"sw": 43,
"sh": 54,
"ro": true
},
"carb_hand_r.png": {
"x": 1250,
"y": 307,
"w": 42,
"h": 54,
"ox": 0,
"oy": 0,
"sw": 42,
"sh": 54,
"ro": true
},
"fox_arm_l.png": {
"x": 1904,
"y": 2,
"w": 133,
"h": 58,
"ox": 0,
"oy": 0,
"sw": 133,
"sh": 58,
"ro": false
},
"fox_body.png": {
"x": 454,
"y": 958,
"w": 170,
"h": 216,
"ox": 0,
"oy": 0,
"sw": 170,
"sh": 216,
"ro": true
},
"fox_head.png": {
"x": 1573,
"y": 494,
"w": 289,
"h": 289,
"ox": 0,
"oy": 0,
"sw": 289,
"sh": 289,
"ro": false
},
"fox_tail0.png": {
"x": 1279,
"y": 653,
"w": 188,
"h": 236,
"ox": 2,
"oy": 3,
"sw": 230,
"sh": 260,
"ro": true
},
"fox_tail1.png": {
"x": 1637,
"y": 296,
"w": 196,
"h": 236,
"ox": 1,
"oy": 5,
"sw": 230,
"sh": 260,
"ro": true
},
"fox_tail10.png": {
"x": 896,
"y": 947,
"w": 206,
"h": 208,
"ox": 0,
"oy": 33,
"sw": 230,
"sh": 260,
"ro": true
},
"fox_tail11.png": {
"x": 1110,
"y": 843,
"w": 198,
"h": 210,
"ox": 1,
"oy": 30,
"sw": 230,
"sh": 260,
"ro": true
},
"fox_tail12.png": {
"x": 2,
"y": 1156,
"w": 190,
"h": 212,
"ox": 1,
"oy": 27,
"sw": 230,
"sh": 260,
"ro": true
},
"fox_tail13.png": {
"x": 676,
"y": 785,
"w": 190,
"h": 218,
"ox": 1,
"oy": 21,
"sw": 230,
"sh": 260,
"ro": true
},
"fox_tail14.png": {
"x": 2,
"y": 746,
"w": 188,
"h": 226,
"ox": 2,
"oy": 13,
"sw": 230,
"sh": 260,
"ro": true
},
"fox_tail2.png": {
"x": 1751,
"y": 813,
"w": 204,
"h": 232,
"ox": 0,
"oy": 11,
"sw": 230,
"sh": 260,
"ro": true
},
"fox_tail3.png": {
"x": 1517,
"y": 785,
"w": 210,
"h": 232,
"ox": 0,
"oy": 14,
"sw": 230,
"sh": 260,
"ro": true
},
"fox_tail4.png": {
"x": 754,
"y": 569,
"w": 214,
"h": 228,
"ox": 0,
"oy": 19,
"sw": 230,
"sh": 260,
"ro": true
},
"fox_tail5.png": {
"x": 2,
"y": 936,
"w": 218,
"h": 222,
"ox": 0,
"oy": 26,
"sw": 230,
"sh": 260,
"ro": true
},
"fox_tail6.png": {
"x": 230,
"y": 746,
"w": 222,
"h": 218,
"ox": 0,
"oy": 32,
"sw": 230,
"sh": 260,
"ro": false
},
"fox_tail7.png": {
"x": 984,
"y": 569,
"w": 226,
"h": 216,
"ox": 0,
"oy": 34,
"sw": 230,
"sh": 260,
"ro": false
},
"fox_tail8.png": {
"x": 454,
"y": 746,
"w": 220,
"h": 210,
"ox": 1,
"oy": 36,
"sw": 230,
"sh": 260,
"ro": false
},
"fox_tail9.png": {
"x": 226,
"y": 966,
"w": 214,
"h": 208,
"ox": 0,
"oy": 35,
"sw": 230,
"sh": 260,
"ro": false
},
"hommer.png": {
"x": 896,
"y": 787,
"w": 158,
"h": 212,
"ox": 0,
"oy": 0,
"sw": 158,
"sh": 212,
"ro": true
},
"img_line1.png": {
"x": 1306,
"y": 296,
"w": 32,
"h": 329,
"ox": 0,
"oy": 0,
"sw": 32,
"sh": 329,
"ro": true
},
"img_line2.png": {
"x": 1250,
"y": 351,
"w": 27,
"h": 309,
"ox": 0,
"oy": 0,
"sw": 27,
"sh": 309,
"ro": false
},
"img_line3.png": {
"x": 2010,
"y": 165,
"w": 36,
"h": 355,
"ox": 0,
"oy": 0,
"sw": 36,
"sh": 355,
"ro": false
},
"img_line4.png": {
"x": 1985,
"y": 522,
"w": 26,
"h": 309,
"ox": 0,
"oy": 0,
"sw": 26,
"sh": 309,
"ro": false
},
"img_line5.png": {
"x": 1306,
"y": 330,
"w": 31,
"h": 329,
"ox": 0,
"oy": 0,
"sw": 31,
"sh": 329,
"ro": true
},
"img_owl.png": {
"x": 1895,
"y": 360,
"w": 96,
"h": 112,
"ox": 0,
"oy": 0,
"sw": 96,
"sh": 112,
"ro": true
},
"img_tree.png": {
"x": 1864,
"y": 647,
"w": 164,
"h": 104,
"ox": 0,
"oy": 6,
"sw": 164,
"sh": 110,
"ro": true
},
"lighting_1.png": {
"x": 1875,
"y": 458,
"w": 187,
"h": 108,
"ox": 20,
"oy": 11,
"sw": 207,
"sh": 122,
"ro": true
},
"lighting_2.png": {
"x": 1896,
"y": 165,
"w": 193,
"h": 112,
"ox": 0,
"oy": 8,
"sw": 207,
"sh": 122,
"ro": true
},
"loadingBg2.png": {
"x": 2,
"y": 2,
"w": 750,
"h": 742,
"ox": 0,
"oy": 848,
"sw": 750,
"sh": 1624,
"ro": false
},
"loadingPro0.png": {
"x": 1325,
"y": 254,
"w": 569,
"h": 40,
"ox": 0,
"oy": 0,
"sw": 569,
"sh": 40,
"ro": false
},
"loadingPro1.png": {
"x": 754,
"y": 220,
"w": 569,
"h": 40,
"ox": 0,
"oy": 0,
"sw": 569,
"sh": 40,
"ro": false
},
"loadingPro10.png": {
"x": 1325,
"y": 212,
"w": 569,
"h": 40,
"ox": 0,
"oy": 0,
"sw": 569,
"sh": 40,
"ro": false
},
"loadingPro11.png": {
"x": 754,
"y": 178,
"w": 569,
"h": 40,
"ox": 0,
"oy": 0,
"sw": 569,
"sh": 40,
"ro": false
},
"loadingPro2.png": {
"x": 1325,
"y": 170,
"w": 569,
"h": 40,
"ox": 0,
"oy": 0,
"sw": 569,
"sh": 40,
"ro": false
},
"loadingPro3.png": {
"x": 754,
"y": 136,
"w": 569,
"h": 40,
"ox": 0,
"oy": 0,
"sw": 569,
"sh": 40,
"ro": false
},
"loadingPro4.png": {
"x": 1325,
"y": 128,
"w": 569,
"h": 40,
"ox": 0,
"oy": 0,
"sw": 569,
"sh": 40,
"ro": false
},
"loadingPro5.png": {
"x": 754,
"y": 94,
"w": 569,
"h": 40,
"ox": 0,
"oy": 0,
"sw": 569,
"sh": 40,
"ro": false
},
"loadingPro6.png": {
"x": 1325,
"y": 86,
"w": 569,
"h": 40,
"ox": 0,
"oy": 0,
"sw": 569,
"sh": 40,
"ro": false
},
"loadingPro7.png": {
"x": 754,
"y": 52,
"w": 569,
"h": 40,
"ox": 0,
"oy": 0,
"sw": 569,
"sh": 40,
"ro": false
},
"loadingPro8.png": {
"x": 1333,
"y": 44,
"w": 569,
"h": 40,
"ox": 0,
"oy": 0,
"sw": 569,
"sh": 40,
"ro": false
},
"loadingPro9.png": {
"x": 1333,
"y": 2,
"w": 569,
"h": 40,
"ox": 0,
"oy": 0,
"sw": 569,
"sh": 40,
"ro": false
},
"loadingTitle.png": {
"x": 754,
"y": 262,
"w": 494,
"h": 305,
"ox": 0,
"oy": 0,
"sw": 494,
"sh": 305,
"ro": false
},
"owl_sleep.png": {
"x": 1875,
"y": 296,
"w": 52,
"h": 19,
"ox": 0,
"oy": 0,
"sw": 52,
"sh": 19,
"ro": true
},
"proDown.png": {
"x": 754,
"y": 2,
"w": 577,
"h": 48,
"ox": 0,
"oy": 0,
"sw": 577,
"sh": 48,
"ro": false
},
"wheel.png": {
"x": 1279,
"y": 363,
"w": 288,
"h": 292,
"ox": 10,
"oy": 4,
"sw": 300,
"sh": 300,
"ro": true
}
}
}, },
{ {
"keys": "cur_light_1.png,cur_light_2.png,guide_fox.png,guide_hand.png,guide_light.png,guide_tip.png,map_avatar_bg.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check_disable.png,map_check_disable_prize.png,map_check_enable.png,map_check_enable_cur.png,map_creditsBg.png,map_energyAdd.png,map_energyBg.png,map_prizeBox.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png,map_推车.png,map_狐狸气球.png,water1.png,water2.png", "keys": "star_dis.png,star_en.png,去抽奖.png,圆角矩形 648.png,道具圆圈.png,闯关成功.png,闯关成功Bg.png,闯关成功不满星按钮.png",
"name": "map", "name": "SuccessPanel"
"atlas": {
"cur_light_1.png": {
"x": 220,
"y": 206,
"w": 187,
"h": 115,
"ox": 0,
"oy": 0,
"sw": 197,
"sh": 123,
"ro": true
},
"cur_light_2.png": {
"x": 132,
"y": 880,
"w": 127,
"h": 101,
"ox": 36,
"oy": 9,
"sw": 197,
"sh": 123,
"ro": true
},
"guide_fox.png": {
"x": 275,
"y": 793,
"w": 202,
"h": 219,
"ox": 0,
"oy": 0,
"sw": 202,
"sh": 219,
"ro": false
},
"guide_hand.png": {
"x": 573,
"y": 113,
"w": 90,
"h": 91,
"ox": 0,
"oy": 0,
"sw": 90,
"sh": 91,
"ro": false
},
"guide_light.png": {
"x": 380,
"y": 156,
"w": 40,
"h": 40,
"ox": 0,
"oy": 0,
"sw": 40,
"sh": 40,
"ro": false
},
"guide_tip.png": {
"x": 2,
"y": 484,
"w": 394,
"h": 166,
"ox": 0,
"oy": 0,
"sw": 394,
"sh": 166,
"ro": true
},
"map_avatar_bg.png": {
"x": 481,
"y": 289,
"w": 95,
"h": 104,
"ox": 0,
"oy": 0,
"sw": 95,
"sh": 104,
"ro": false
},
"map_check_disable.png": {
"x": 481,
"y": 178,
"w": 109,
"h": 90,
"ox": 0,
"oy": 14,
"sw": 109,
"sh": 104,
"ro": true
},
"map_check_disable_prize.png": {
"x": 511,
"y": 2,
"w": 109,
"h": 104,
"ox": 0,
"oy": 0,
"sw": 109,
"sh": 104,
"ro": true
},
"map_check_enable.png": {
"x": 220,
"y": 395,
"w": 103,
"h": 82,
"ox": 1,
"oy": 16,
"sw": 109,
"sh": 104,
"ro": false
},
"map_check_enable_cur.png": {
"x": 170,
"y": 793,
"w": 103,
"h": 82,
"ox": 2,
"oy": 15,
"sw": 109,
"sh": 104,
"ro": false
},
"map_creditsBg.png": {
"x": 325,
"y": 395,
"w": 185,
"h": 71,
"ox": 0,
"oy": 0,
"sw": 185,
"sh": 71,
"ro": false
},
"map_energyAdd.png": {
"x": 235,
"y": 877,
"w": 35,
"h": 33,
"ox": 0,
"oy": 0,
"sw": 35,
"sh": 33,
"ro": false
},
"map_energyBg.png": {
"x": 337,
"y": 206,
"w": 185,
"h": 70,
"ox": 0,
"oy": 0,
"sw": 185,
"sh": 70,
"ro": true
},
"map_prizeBox.png": {
"x": 220,
"y": 2,
"w": 158,
"h": 202,
"ox": 0,
"oy": 0,
"sw": 158,
"sh": 202,
"ro": false
},
"map_prizeBtn.png": {
"x": 409,
"y": 198,
"w": 152,
"h": 70,
"ox": 0,
"oy": 0,
"sw": 152,
"sh": 70,
"ro": true
},
"map_ruleBtn.png": {
"x": 380,
"y": 2,
"w": 152,
"h": 70,
"ox": 0,
"oy": 0,
"sw": 152,
"sh": 70,
"ro": true
},
"map_star_disable.png": {
"x": 235,
"y": 939,
"w": 25,
"h": 24,
"ox": 0,
"oy": 0,
"sw": 25,
"sh": 24,
"ro": false
},
"map_star_enable.png": {
"x": 235,
"y": 912,
"w": 26,
"h": 25,
"ox": 0,
"oy": 0,
"sw": 26,
"sh": 25,
"ro": false
},
"map_taskBtn.png": {
"x": 2,
"y": 880,
"w": 133,
"h": 128,
"ox": 0,
"oy": 0,
"sw": 133,
"sh": 128,
"ro": true
},
"map_推车.png": {
"x": 170,
"y": 484,
"w": 247,
"h": 307,
"ox": 0,
"oy": 0,
"sw": 247,
"sh": 307,
"ro": false
},
"map_狐狸气球.png": {
"x": 2,
"y": 2,
"w": 216,
"h": 480,
"ox": 0,
"oy": 0,
"sw": 216,
"sh": 480,
"ro": false
},
"water1.png": {
"x": 452,
"y": 119,
"w": 57,
"h": 101,
"ox": 0,
"oy": 0,
"sw": 57,
"sh": 115,
"ro": true
},
"water2.png": {
"x": 452,
"y": 2,
"w": 57,
"h": 115,
"ox": 0,
"oy": 0,
"sw": 57,
"sh": 115,
"ro": false
}
}
}, },
{ {
"keys": "prize_check_0.png,prize_check_1.png,prize_check_10.png,prize_check_11.png,prize_check_12.png,prize_check_13.png,prize_check_14.png,prize_check_15.png,prize_check_16.png,prize_check_2.png,prize_check_3.png,prize_check_4.png,prize_check_5.png,prize_check_6.png,prize_check_7.png,prize_check_8.png,prize_check_9.png", "keys": "prize_check_0.png,prize_check_1.png,prize_check_10.png,prize_check_11.png,prize_check_12.png,prize_check_13.png,prize_check_14.png,prize_check_15.png,prize_check_16.png,prize_check_2.png,prize_check_3.png,prize_check_4.png,prize_check_5.png,prize_check_6.png,prize_check_7.png,prize_check_8.png,prize_check_9.png",
......
...@@ -160,6 +160,7 @@ let fc; ...@@ -160,6 +160,7 @@ let fc;
* @param netName * @param netName
* @param parameter * @param parameter
* @param callback * @param callback
* @param hideMsg
*/ */
export function sendTbNet( export function sendTbNet(
netName: TbNetName, netName: TbNetName,
......
...@@ -13,8 +13,6 @@ import Sprite = FYGE.Sprite; ...@@ -13,8 +13,6 @@ import Sprite = FYGE.Sprite;
import Texture = FYGE.Texture; import Texture = FYGE.Texture;
import Tween = FYGE.Tween; import Tween = FYGE.Tween;
import Ease = FYGE.Ease; import Ease = FYGE.Ease;
import { sendTbNet, TbNetName } from "../../TaoBaoNet";
import { showToast } from "../../../module/ctrls";
export class MapScene extends Scene { export class MapScene extends Scene {
private mapContainer: Container = null; private mapContainer: Container = null;
...@@ -228,7 +226,7 @@ export class MapScene extends Scene { ...@@ -228,7 +226,7 @@ export class MapScene extends Scene {
// // }, // // },
// prize: { // prize: {
// image: 'https://img.alicdn.com/imgextra/i1/2275046294/O1CN01xTeKMI1wMhRux48Y6_!!2275046294-2-miniprogram.png', // image: 'https://img.alicdn.com/imgextra/i1/2275046294/O1CN01xTeKMI1wMhRux48Y6_!!2275046294-2-miniprogram.png',
// } // }]
// }); // });
} }
......
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